emacs24-common: conflict with obsolete gnus-bonus-el package

Thanks to Hilko Bengen for reporting the problem.

Closes: 767949

diff --git a/debian/control b/debian/control
index 8adf310845d9f3c093a0610f4a797ff2889f0f30..199718dd8d6b3e244da401dbdebf474e13c953ee 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Package: emacs24-common
 Architecture: all
 Depends: emacsen-common (>= 2.0.8), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
 Suggests: emacs24-el, emacs24-common-non-dfsg
-Conflicts: emacs24-el (<< ${Source-Version}), cedet, eieio, speedbar
+Conflicts: emacs24-el (<< ${Source-Version}), cedet, eieio, speedbar, gnus-bonus-el
 Description: GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure

diff --git a/debian/control.in b/debian/control.in
index 6169897dbebf40b2223d5ab75292e0d8d78345ef..266ae90ada0d6830aa09028b703c1bd464dbdc51 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -99,7 +99,7 @@ Package: @DEB_FLAVOR@-common
 Architecture: all
 Depends: emacsen-common (>= 2.0.8), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
 Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), cedet, eieio, speedbar
+Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), cedet, eieio, speedbar, gnus-bonus-el
 Description: GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure